Update debian-files

diff --git a/debian/control b/debian/control
index a2fad4b1278b5a37d2dbb295c1a2c53681ab1e7b..1e2291af5658db094a25e6f044eb2e30c8083f27 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -158,8 +158,7 @@ Description: VTK libraries
 Package: libvtk9-java
 Architecture: any
 Section: java
-Depends: libvtk9-jni (= ${binary:Version}),
-         ${java:Depends},
+Depends: ${java:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: java-virtual-machine,

diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install
index 2f0cca12a5edbc43d46d2200f6b8fa6e6293bd21..8caa0e1bd3e5e4be84923c01940de18382638d33 100644 (file)
--- a/debian/python3-vtk9.install
+++ b/debian/python3-vtk9.install
@@ -1 +1,2 @@
-usr/lib/*/python3*/site-packages/* /usr/lib/python3/dist-packages/
+usr/lib/python3
+usr/bin/vtk9python

diff --git a/debian/rules b/debian/rules
index e949fb4f3ac662b8a75d1b55811646850d1c4b6b..cb20e357554eaa92d6340269666e738e732f4292 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,13 +80,13 @@ override_dh_auto_build-arch:
 override_dh_auto_install:
        pwd
        dh_auto_install -X.pyc -X.pyo
-       # Modify vtkWrapJava.cmake to properly upload JavaDependencies.cmake.in from $VTK_DIR
-       perl -pi -e "s|{dir}/JavaDependencies.cmake.in\"|{VTK_DIR}/JavaDependencies.cmake.in\"|" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-8.2/vtkWrapJava.cmake
        # Correct headers for paraview
        mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
-       mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk9python
+       mv $(CURDIR)/debian/tmp/usr/bin/vtkpython $(CURDIR)/debian/tmp/usr/bin/vtk9python
+       mkdir -p $(CURDIR)/debian/tmp/usr/lib/python3
+       mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/python3.9/site-packages $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages 
        sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake
-       chrpath -d $(CURDIR)/debian/build/bin/vtk9python
+       chrpath -d $(CURDIR)/debian/tmp/usr/bin/vtk9python
 
        find $(CURDIR)/debian/tmp/ -name "*.pyc" | xargs rm -f
        find $(CURDIR)/debian/tmp/ -name "*.pyo" | xargs rm -f

diff --git a/debian/watch b/debian/watch
index 7adc3c7f780f6a1323f38b19a7b693d234aba8cb..59c899983d4dd66d4f095b6a5b1e7b7b7d505fe6 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=repacksuffix=+dfsg1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
-https://github.com/Kitware/VTK/tags .*/v?(9\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+https://github.com/Kitware/VTK/tags .*/v?(8\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))